Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Sat, 16 Jul 2011 19:39:34 +0000 (12:39 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Sat, 16 Jul 2011 19:39:34 +0000 (12:39 -0700)

Trivial merge